Merge "Work around tzcode's reliance on signed overflow."