Bug: 30622771 Test: manual Change-Id: I46b6486619cc7366e56b25ca48937e6792f53e1d (cherry picked from commit 53501ad2)