Merge "Add suggestManualTimeZoneSuggestion to the client" am: 63d5f12489 am: 2447fe6f69
am: ee036c7535

Change-Id: Ia6481faf3520b01d5d1ee821362d6c739479b42c