Merge "Basic changes to the LocationTimeZoneProvider API"