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

Change-Id: I821b7c07cfb39dbffd09e70fb6a9b97c4797e393