Merge "Fix SimpleDateFormatTest when run outside California"