Merge "ResourceLoader: Stop passing around errors as /**/-comments"