Merge "(bug 32297) Use symbolic names, not offsets for a default timezone."