Merge "dumpstate: Continued build breakage" am: 16072e7e17
am: c01e8dc4a6

* commit 'c01e8dc4a687ae3445f68b8d005e2b29a84f6e7f':
  dumpstate: Continued build breakage