Merge "Add (disabled) time zone update system server impl"