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