Merge "Remove DumpstateOptions"
am: 706b2d0e16

Change-Id: I4134f2cd095e8d91a7f4444030a4c1523adb5483