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