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

Change-Id: I36a5430deda8eb80e24a0c6e6327b3699d908010