Merge "SimpleDateFormatTest: Fix a couple of bogus tests involving non-olson tzs."