[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 225c23e3c3 -s ours am skip reason: subject contains skip directive Change-Id: I9702f995fa68c05349e72c050d03ecf482547964