Merge "Make Preferences tests language-agnostic"