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