Merge "Time zone update API classes" am: cfe0c2f1ec
am: 463f3f8cf7

Change-Id: I519483f82e12a038e52f3b4813b0db0325749925