Bug: 30622771 Test: manual Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75 (cherry picked from commit 9de522c6)