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

Change-Id: Ifa38a8ec02872b240cbbc6c1933b9cf7fb595b25