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