Merge "Time zone update API classes"
am: cfe0c2f1ec

Change-Id: I6442aee1844ec9c6ef1017a4744936252ef45243