Merge "Delete flaky DCHECK" am: 1b87033ed8
am: 9a9a25bca4

* commit '9a9a25bca4bcba80f2c8311ca62c7038f88b5c9b':
  Delete flaky DCHECK