Merge "msm: Disable PM2 for 8625 bringup" into msm-3.0