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

Change-Id: Ic82572f406fd56dd11afce108e14ff0dcb45557e