am e06f6d7a: am 4aec0446: (-s ours) am ed32594d: am 2cb9994c: Merge "dumpstate: remove unnecessary mkdir"

* commit 'e06f6d7a85f005d906ee37b94eb59d4da10a178c':