Merge "msm: gss-8064: Remove legacy restart-via-SMSM code" into msm-3.4