Refactor for qcom-common
Merge pull request #2 from Somber73/patch-1

Refactor for qcom-common