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

Change-Id: Icecd5dfc214a956e93d3e8a71bd428b220525eef