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

Change-Id: I7bd2e1ff519f1ebc23e225534afdffde4f65bec4