Bug: 29754520 Test: cherry-pick from internal tree Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37 (cherry picked from commit 58dd0cd6)