Switch to cm qcom-common