Refactor for qcom-common

Change-Id: Ib7308e76b4dfb86b087bd14ba33e8d96937b6cf4