Merge "Ensuring thread-safe usage of DateFormat."