Merge "Remove data_utils import from a service client"