Merge "More time zone update API classes"
am: c301339498

Change-Id: I23ace2d5102f197ca6d6e22a37b54b43e38753ed