Merge "Add suggestManualTimeZoneSuggestion to the client"