Merge "Fix replacement time zone ID generation logic"