Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I98bc019b3729f08421c7d52ceb837d5f64d6f8ac
Change-Id: Idb497e120c35202fe7ff3bde0dda12b2b816dfc7