Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
am: 2ae7c371cb
am: 6bc38f14a5
am: 819edf41f3
Change-Id: I55c5677701261f8d8f7690bad243005fd6f00d77
This commit is contained in: