resolve merge conflicts of 7e29d177 to stage-aosp-master

Test: build
Merged-In: If42b6cb1bf9ffb3dd04f557279efdc37e1ac259a
Change-Id: Ic30cc01f0abc26347d3747b51d1998f7815fea99