Merge "Fix file paths for DumpstateUtil calls in 1.0" am: a108098648 am: 0ecb8220b2 am: 70729b61ac am: baf53ce1c0

Change-Id: I42a699619d77813974bebb29a9fb1ff2997b9e2f