Merge "diag: Add Subsystem restart support" into msm-3.0