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

Change-Id: I940bf1db9d800436a69759267de5b2ea2d1d35bc