Merge "Simplify APIs exposed for time zone lookups" am: 19de70814a
am: fbf9b6c05a

Change-Id: I5a6e07fbc9b9e856392c85c25c244125d784e063