Merge "msm: clock-8610: Fix measurement for CPU and BIMC clocks"