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

Change-Id: I54375370e05fcbfc9eb7a91d20b07d573f240398