Merge "Fix the UniquePreferenceTest."