Merge "Remove unused DumpstateOptions parcel"