Merge "msm7630_surf: Disable remote spin locks"