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

Change-Id: Ieb16f21c95a1fd332530e1630101b56e8c4efdb7