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