Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I97316678d08ab460eccd8bf54fa6642f2c6b4fee
Change-Id: If81d2c30f480068a55c5fc12f47a1cfb54086302