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