Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c
Change-Id: I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc