Merge "Moving zip rule to Multivalent to fix roboelectric test in A-studio" into main