Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Ib80ec6698bcfde956aefdec718a693470090f208
Change-Id: Ieb2888409c752e121015442094dca478facced00