Merge "DateUtils should use the user's 12/24-hour preference, not the locale's."