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

Change-Id: Ifa1f98e7fe882145dd5b44e0a5da037caa14c4d6