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

Change-Id: Ic12f5c31a985fba022b95ece90c4d4e2fff9ca29