Merge "Remove babel service name override"