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

Change-Id: I5abb890b103a6a5b880698d04c16c861c1551e6c