Refactor for qcom-common