Merge "Add TimeZoneProviderEventPreProcessor." into sc-dev