Merge "Fix a raw ServiceReference"