Merge "Revert "Remove DCHECK that does not work for gtests.""