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

Change-Id: I36e373913a0eeaf1bbb0c814015ba6bc6fb8a3e8