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

Change-Id: I5664629bea2c04d8a293eb4e60a17c40824cc834