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

Change-Id: I13c75b4f40a44c9af28937534207a676615a10aa