Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Iac158e7721f651cc0d041fd310d01808d549a4db
Change-Id: Ib8828047260ea745fa9513812b3dbc6b61806d86