Merge branch 'opp/qcom-updates' into opp/linux-next