Merge "Ensure thread-safety of SimpleDateFormat" into rvc-dev