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

Change-Id: Ibbbfe9d295fe6fccc2c48af8ce29f1867c78647f