Merge "Simplify APIs exposed for time zone lookups"