Merge "diag: Add support for QSC restart" into msm-3.4