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

Change-Id: I8d17f0f135f9a53a46646f256e8fef7d6beb3cae