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

Change-Id: Id5f233358c773f81e5d58d96f98b178fbaaae12e