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

Change-Id: Icfba3e141e2050cc71c9df1adad233dcd3f47587