Refactor for qcom-common

Change-Id: I8b418c2dfe0eae27b68019c3702d299bf22e9d67