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

Change-Id: Ieca28957cabade9c407fcba068ca48f30475f2c2