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

Change-Id: I29d17521da2675c0c94c6752bdd4125cde21b6b9