add qcom/common back