Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I1512f0aee1f960e809a42448b9aafed0de3dbc2a
Change-Id: I12dddc8066b2477f7dce5778ab3dd96d6e43afc4