Merge "msm: clock-local2: Swap the branch clock halt status strings" into msm-3.0