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

Change-Id: Ibf7cdf6e987831be0ecde5c35bc2e5fa4fd71ddb