qcom-common fixup