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

Change-Id: I25d239af24b390e665a9a24e60bcbfb1a0807f73