Migrate to msm8974-common