move these to msm8960-common 2/2