Merge "Improved dumpstate logging." into nyc-dev
am: 503ebdbc5e

* commit '503ebdbc5ecae9dda74124a4350c40f81a695c02':
  Improved dumpstate logging.