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

Change-Id: Ie9555e7d7288f52419e91ca9b554822a35c8a6c2