Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I3cd1f27c5fb2df7fcd433c2c47b42e5660ff9326
Change-Id: I27af802191998fcb0490ffa7887ecf4657f7cf28