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

* commit '0cb5c86b7021e70cbf584c1455aad1ef383af786':
  Dump different fields in imgdiag

Change-Id: I15d590b50a0a9ad7d04a99fe88612e71b4661dc5