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

Change-Id: I9ed570dfdd47af38f8b772cf8dac57dbb2109857