Start using sortByKey for order by

Summary: -

Test Plan: -

Reviewers: marcua, dyschultz, lydia, jblum

Reviewed By: jblum

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