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

Change-Id: Ia269439eb245921deaacd180604ebc919600ee80