Merge "diag: fix hsic concurrency issue when in MEMORY_DEVICE_MODE" into msm-3.4