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

Change-Id: I211934d7086d9aa293b60c3a359d0b94459bd0b5