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