Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I242e5b8a82ab0ece8b067ee6d63a8c65f59aae6d
Change-Id: I41c44b69961402b07ad5a255eceb19df626bdf2d