A few more WorldTime related fixes.
A few more WorldTime related fixes.

Somehow these escaped the previous commit.

Change-Id: I9d8af16e60e9d5334a860a622cf153e4ac065be4
Tested: on Linux.

google/zooshi,google/zooshi,google/zooshi,google/zooshi,google/zooshi