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

Change-Id: I5d86cb78b2a7c5e5c48e56903a10c1ab5e7c0423