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