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

Change-Id: I187c211d8846c5f25d84ffbafc1421ea802f0a70