Merge "Remove too aggressive DCHECKs."