Merge "Time zone update API classes" am: cfe0c2f1ec am: 463f3f8cf7
am: 3620392aca  -s ours

Change-Id: I2e7c0837ec5f5bc0f93c695ef7cc812305aa6d5c