Summary:
Fix

lint

Test Plan: Re-enabled tests

Reviewers: yzhao, zasgar, #engineering

Reviewed By: zasgar, #engineering

Differential Revision: https://phab.corp.pixielabs.ai/D5626

GitOrigin-RevId: 2fa247f0939413e7eb9ec26690f244620d7d3c39