Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ied7d6cc41cb06134d160fd14bb89aa5b052d42c5
Change-Id: I5646e579ff910e009423f776f9a49b16456b9810