Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I3019213d57f0a5c1e2bc4bcb9b8d29e0b1b0ce33
Change-Id: I92c2eb670627519d91be949a4fe98bb3e75cdb24