Cross Commit from Proxygen Cleanup