Merge "Stop using self.parameters for compute clients"