Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
am: c9e4a2934f
am: 9a58bd18f4
Change-Id: I57f2ae1e17ce80ee7e7ba946d6cc198e493263a2
This commit is contained in: