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

Change-Id: Ie71cd169b9a763cb697dd581f4733580031051a6