Merge "Dump different fields in imgdiag" am: 0cb5c86
am: 56ce407

* commit '56ce407581de011134763ca4d6e45bf77fc14bbf':
  Dump different fields in imgdiag

Change-Id: Ife01ec90349eb804d31f5af4ebd62f5a89a69c1d