Merge 3.9-rc7 into driver-core-next