Merge "Fixed bug on premature DCHECK. With fail-before/pass-after test"
am: 85b3b52a93

* commit '85b3b52a931b54380be3753216e97431ae2215a9':
  Fixed bug on premature DCHECK. With fail-before/pass-after test