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

* commit '079e88ff01422f6a4ef56bd4617047bf62b3072f':
  Revert "Remove DCHECK that does not work for gtests."