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

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