Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Id38cccf76c45f40c77718a4ec5334e43f59aad54
Change-Id: Iab1e25c2d1aa711a6b8e0d3f32c0611163e54168