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

* commit '16072e7e1717bcf1ea8be99eb7af90974dbbeeb7':
  dumpstate: Continued build breakage