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

Change-Id: I0b0a72677f81bcd926e40e47b7b17acfb41a7f26