Moved to qcom-common