Merge "More time zone update API classes" am: c301339498 am: 9798dc47b1 am: 2cf4771469
am: aac434b431

Change-Id: I9d37119e5b6952bad07bcb99c9606b0c76516b30