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

Change-Id: I67ef2cc1cd008a0cd44c2649bdde9d8a3da662bb