bug: 64382372 Test: m (cherry picked from commit e826477a) Change-Id: I68bf0606183c63f6e28d94574ad6260f9b429bf7