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

Change-Id: Ifb6459d4df4dd8a60d05f28cb0906fd7f05fa94b