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

Change-Id: Ia85f1ec883b8ac8cb9a93dfbfabacd1589aafe8f