Merge "Remove duplicate ServiceWiring definitions"