Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ida39743601fcb033082c966d73d8f2a47b517842
Change-Id: I619e01ef90e4f0b5c9dd5f794edf269deacb4324