Summary: TSIA, depends on D4882.

Test Plan: existing should pass

Reviewers: philkuz, jamesbartlett, zasgar, #engineering

Reviewed By: philkuz, #engineering

JIRA Issues: PP-1928

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

GitOrigin-RevId: 20d7ae02072b0604d3d592e1a363140a10693d14