Bug: 177561690 Test: on device Change-Id: Icafbdf54fe807f8779377b13cb4e4eb265db692e (cherry picked from commit abccd8f7)