Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I36ef500183d5f4dff2d78db29c3c7eff97d832b9
Change-Id: I63592b99f8dd8ea060f92ef086a929cdf61b9650