Merge "imgdiag: Fix rarely flaky imgdiag_test."
am: ef45113d01

* commit 'ef45113d01c16102538a8848d6979e772dad6225':
  imgdiag: Fix rarely flaky imgdiag_test.