Merge "Make LocaleUtils.constructLocaleFromString as @Nonnull"