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

Change-Id: Iedbc4a80b76de238520caada3f4ed1efa878f18b