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