change to our qcom-common for now