Merge "Remove DumpstateOptions" am: 706b2d0e16 am: bc960e3905
am: 454d6e56f3

Change-Id: I765b9e390a709ced07f9173d05d95df5243764ab