Merge "Remove __METHOD__ in ServiceWiring return array"