Merge "Simplifies the service resolving logic in RRMS" into sc-dev