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

Change-Id: I8f9c268ac2cf791959a74cd4413b4e1d03c67c56