Merge "Remove stalled DCHECK." am: 9c6ad8e5da
am: 95f63e6473

* commit '95f63e6473fef75d5af93ce74e71ea9616eaea6f':
  Remove stalled DCHECK.