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

Change-Id: I30599762fdedd129c7a6a104ed0b9fe3a768d999