Bug: 181789336 Test: manual Change-Id: I2a230933ef38a2b963fb4c6baef9d777086f676f (cherry picked from commit 6c3be24c)