Merge "Fix a DCHECK failure IsResolved() || IsErroneous()."