Merge pull request #16932 from c0b/fix-race-16924

Fix race #16924 [panic: runtime error: slice bounds out of range] docker daemon crash of racing