Refactor for Qcomm-common