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

Change-Id: Ie17c36cce0d8ec9f080b3a78b83d4392c2329e4e