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

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