bb146eff49
Test: Manual test on device Bug: 218570612 Change-Id: Ie12b570f1e6400ab9e289b882e5821921a609e0a (cherry picked from commit 1611a8d1c53b343b8d02d7e4e16e5e8060b573d4) Merged-In: Ie12b570f1e6400ab9e289b882e5821921a609e0a