Merge "Add clk tracing to freq category"