Refactor for qcom-common

Change-Id: I1b54bc65a5aaa1496afa0ece32009fcb1d2e48ba