Bug: 30622771 Test: none Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971 (cherry picked from commit 89e10d3eb4)
89e10d3eb4