Refactor for qcom-common

Change-Id: I3a15a1fe9c61e165d388fe960bc8d9300295bc6d
Fixup