Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ic0b8d84bd1d484488e288410eb0acb40785adaf9
Change-Id: Ia05ad76f4602ee1084d1d85053663dd682a1a33e