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

Change-Id: I5cbd25fc048187fd116bd6edfc70fe8bc4632f48