Bug: 122769846 Test: Test on phone Change-Id: Ifcf6575c3c65cb38e8787e32bc04b0e4532f7170
a24e12b46e
7261b8a16c