Merge "Fix zipapex test-bot."