Merge "Fix tests which relied on Pacific/Apia DST offset."