Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: If9dead858eae636267b36f3fa8fdecea4195a21c
Change-Id: Ie5b6e5a83380a10bcd98812d232d378593f8b458