This class is just Preferences now, not Reset

Change-Id: I2ca32f3ab5cdfc82f351e17662893822d7fc4f9b
Merge "This class is just Preferences now, not Reset"