Get rid of QCOM_BSP for now