Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I33e9a78c1ce3a57c38010933632fef854c39cd79
Change-Id: I79df146f8e7302c5afbb8ef7cdcd20c32501a5be