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

Change-Id: Icf3f574255ca7f8be62999fc32bf4062b713fe9f