Merge "Enable the TimeZoneManagerService"