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

Change-Id: I44ad6e3ff3df8130c28154e58ae7ea440fbdebbf