Merge "Delete flaky DCHECK"
am: 1b87033ed8

* commit '1b87033ed83ba03983b49237da89ce36d319b68e':
  Delete flaky DCHECK