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

Change-Id: Iac5f0f30d0a05dc594fdacd6b089d1737a3634d4