Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I70ca5c19252038eba1852f60ddcd6172bee9c65f
Change-Id: I075961a717a9a604877dfbece5251a45a2ca8481