Merge "Time zone update API classes"