Merge 3.3-rc2 into the driver-core-next branch.