Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I1f3c96de396b9bfbdee7496ae8e4e6691b7f9a8a
Change-Id: I47955dade0e6fa63283bfea5ef28e563a3fdcf44