Refactor for qcom-common

Change-Id: I5bc5d5e5c09f1d5753d12b4a7c3fcc208baa0fe0