Merge "msm: restart_7k: Move restart code out of pm2.c" into msm-3.4