Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ic60a5c6751df78012120c6dae147da779e529973
Change-Id: Iea3f9a4a47d7f00417a56b5fc297b0e5d7e90053