Merge "Extract ResolvedComponentInfo to top-level." into tm-qpr-dev