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