Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I047a6d3c09be4f762a745319e2f37d5551abf9f1
Change-Id: Icce4e4f44a811726f76a8602a44e9060cc1dbaa1