Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864
Change-Id: I0bcb339f01c664e59e258daf901460523b84c468