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

Change-Id: I4c6db4219a673da35e0666c1b51051d93ab38da9