Merge "Simplify APIs exposed for time zone lookups" am: 19de70814a am: fbf9b6c05a am: 80bd973c3b
am: 4082aa586b

Change-Id: I082abb42e5cf17e8a5ef991459ed17205a5e1133