Refactor for qcom-common

Change-Id: I80cce0363418c22ced680779658d25a2fc294a13