Merge remote-tracking branch 'qcom/qcom/for-next'