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

Change-Id: I011145107f9b228272814bbdc73aa8fe35a0d984