Bug: 196019329 Test: manuak Change-Id: Ifb79e402540b4aef58f829312e836b4f11114a5d Merged-In: Ifb79e402540b4aef58f829312e836b4f11114a5d (cherry picked from commit 3f4bddc3)