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

Change-Id: I46686b922cdf4c77f063d93d09e43381b5d466b7