Bug: 138594779 Test: manual + pref test Change-Id: I1620189799dc83cb1c255ca30c4ef29e73e73756
1876b8c6dd