Merge "msm: clock-local: Make branch ctl_reg optional" into msm-3.4