Bug: 293467489 Test: tested on device Change-Id: I1abb2b880a37f18c0a5e28c4e22d739703d1f20a Merged-In: I277458bb1f6d7ece1f9efc8054a8d3d9b3924000