Refactor for qcom-common

Change-Id: I05f7724bc7741ad118af26c1d63dadbc552ab70d