Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ia5b58346de9952c5f14ee17b268dd8eb992c4e67
Change-Id: Ia312566ae2082f2d813401d0e54ec785ffc0e171