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

Change-Id: Ib2a57b977070f96ffad51d712959e210f042ceed