Merge "diag: Fix race condition for HSIC while in MEMORY_DEVICE_MODE"