[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 254ddbfa71 -s ours am skip reason: subject contains skip directive Change-Id: Ib911f556e6169db9eb1967bc456716f3cc5df5f6