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

* commit '9ecf9c8ad0f79441b801ad5651eb85d3bee49578':
  Dump different fields in imgdiag

Change-Id: I79a8d05d13002459bb3bb9580bd82b54ab7d51ea