Changes for PyPI

Test Plan: -

Reviewers: lydia, dyschultz, marcua

Reviewed By: marcua

Differential Revision: https://phabricator.locu.com/D7752