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

* commit 'f90be7f6f6e7dfffed6aa3e8c4c31a8a67853135':
  Delete flaky DCHECK