Merge "msm: 8226: add support for machine restart"