Merge "Remove the migrated service client"