Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I1a854f0d6be46cfd11ada58fa54589147e0f37d7
Change-Id: Ie6a45f85c0259bf28def19d3b82152993529641e