Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ia0452af423a3c4bcc581476cfe8637df3876cefc
Change-Id: I27836a514e3a2c4dee46eb0539c49de6c99ccb71