Merge "Simplify APIs exposed for time zone lookups"
am: 07dcc4bc0f

Change-Id: I8e9c7c8e8f3ed98a21acb3bdc23358fa594cd5c9