Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I8bc2fc55fe3ac438b571d66d7323e3fc74dc678b
Change-Id: I5c36ecbac4c423627c8cab1b65a6e77bde5bd55b