Merge "Revert "Remove DCHECK that does not work for gtests."" am: 6fcb8b95e2
am: 74cfd16ec6

* commit '74cfd16ec65f266f62f5b20ee4fb3724a0bd3a08':
  Revert "Remove DCHECK that does not work for gtests."