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