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

Change-Id: I972eaa1f3994cb8fa8fb936ea520a9f59ef19c8f