Bug: 174151048 Test: on device Change-Id: I5a3a77557720571b455ffec296cdd4e2e1a02f7b (cherry picked from commit b5765cc3)