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

Change-Id: I7d31b1c79a54e809d8d9fe432f941010271f26ba