Merge "[automerger skipped] Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b am: 6982bf4bde am: 1bc3c74685  -s ours" into pi-dev-plus-aosp