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