Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Ia3291351c3a758ecc3a4afd4d37a39a9ba869f21
Change-Id: I6be00ccf08ba678f86ec62a6b8577781cef13809