Merge "Migrated dumpstate to C++." am: 1f62517b36
am: 32a59625e0  -s ours

* commit '32a59625e0a70eb38648320ddde84e6c91cc9cef':
  Migrated dumpstate to C++.