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

Change-Id: Ib00a0dd0a4adcffc52780a3ffd1ac165adb818f1