changed to our qcom-common