Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I2201b571c4b6757c0f44448141c49269600a0b06
Change-Id: Iee8ef3846183f9bc1d3c455f7e862328d96462bd