Merge "Add QCOM QMI support"