Refactor for qcom-common

Change-Id: Idcb5fed5ebb17aec1bbbe480f2aa8c3eb5b466d5