Merge "Templatize loops in imgdiag"
am: e3f66f506c

Change-Id: Ic24f322db1f7cd3f38a01dc2a823d3d46a517c2d