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

Change-Id: I058dbe387bbebe61eb03507e64285fa27f0b7108