Merge "Fix TzIdProtos TimeZoneReplacement traversal logic"