Merge "diag: Add missing fixes for diag sdio bridge" into msm-3.0