Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I3ae0e489ccccb59869cfb9a5737790d8c079cbab
Change-Id: I0219de06937adc4fbdd883403612badb398ea309