Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I9dbd7774c5f46836d95af41b379552053d0d926c
Change-Id: Id5a3b15133417f21f147ddf8eecfd8e32d6f66da