Merge "Fix NPE in DateFormat.is24HourFormat." into klp-dev