bug:64382372 Test: m Change-Id: I2ba92e8a7c04dca9c77f8ce58c5b9e85726c52d8 (cherry picked from commit ba0be3aa)