Merge 3.12-rc2 into staging-next.