Merge "Set and restore default timezone in DateUtilsTest"