Merge "msm: clock-local2: Modify halt check to account for NOC FSM handshake" into msm-3.4