Revert back to QCOM_BSP

Change-Id: I253884b15f52f403efcc46e66bc93cf85e91c82d