Merge "Relax too strong DCHECK."
am: dba2b19

* commit 'dba2b19c845f6bccb43a036fa8602197c3248ff2':
  Relax too strong DCHECK.