Merge "Fix compilation for CONFIG_RATE_CTRL"