Bug: 269670598 Test: Tested manually on a physical device Change-Id: Ifd75418eb969b5d1de8625c0b9ff8884f8005ec5
258019fe8e
1f27273c06