Merge "Fix LocationForWorkPreferenceControllerTest"