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