Merge "Dump different fields in imgdiag" into nyc-dev
am: 9a9f658

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

Change-Id: Ic98f2169d8ae934cdd66c3d49cc23a6acae0253d