Rebase from latest ACR.