Merge branch 'qcom/defconfig' into qcom/all