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