Refactor for qcom-common

Change-Id: I439fdf15e64baf2ffb0334af251d9914867532f3