Merge "Do not require context in ControlLoopOperationParams"