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

Change-Id: I2b1723fcd8a0cfef64e7b1d1101f74da35dbeaa9