Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I6756cad681e4cfa01868450214da0d7b2d5261e4
Change-Id: Ia529ecf4f48248d5af63673f359916486f71bc35