Merge "Tidy up changes for timezone update code"