Refactor to use qcom-common

Refactored to use qcom-common