Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ic0ddf351b39951accaff295f2f5a5d1fa4940ace
Change-Id: I9642ce5da4eb2da1804049d8027144ed547e8493