Merge "Locking to protect SimpleDateFormat" into rvc-dev