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

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