Merge "Fix raw ServiceReferences and ServiceRegistrations"