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