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