am 3b7261d5: am ed32594d: am 2cb9994c: Merge "dumpstate: remove unnecessary mkdir"

* commit '3b7261d5de91fb03fc97cb05fd8448a399e2b0a5':
  dumpstate: remove unnecessary mkdir