Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I05d576339afeaca4046628c88d9738d2d970514e
Change-Id: Iff02f9c0e289a4e9c907d2f42dcfdbea54322970