Merge "Change DCHECK into CHECK to diagnose sporadic crash." am: 2dbab9548b
am: b7346d5f93

* commit 'b7346d5f936f74a2c320b57c6a9c539d0fb0cc85':
  Change DCHECK into CHECK to diagnose sporadic crash.