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