Merge "dumpstate: build breakage @2482293" am: c93d0937e4
am: 8197219a6e

* commit '8197219a6e34d72174fc69ff60608afec912a4f4':
  dumpstate: build breakage @2482293