Merge "Fix de-serialization issue in java.util.Locale"