Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I4d20aa39031c89981107a3e4c93f113b1344c4ba
Change-Id: Idb85d3d97920759074b06231c82b9baee7a6992f