Merge "Use ImmutableSet/Map in ServiceReferenceRegistry"