Merge "diag: Fix race condition in diag mempool"