Merge "Enhanced4gBasePreferenceControllerTest migrated to junit"