Merge "API for retrieving time zone IDs by country" am: 4492ec573a
am: b5ab9c2e1f

Change-Id: I69b477e36d760e5d06c232fc7fd0891d98dd52b6