Merge "Add UT for ResourceResolutionService/Component"