Merge "Fix DateFormat k and h, and implement K and H for the first time."