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

Change-Id: If1eac7ad024e4ce05a5c264fe3bfb9e39ee4c536