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

Change-Id: Id45d3ef494fdb2bc2edca834adb58b111b38dda8