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