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

* commit 'c93d0937e4e86a260f4dc6b91971b6750f67a3f3':
  dumpstate: build breakage @2482293