Thrift: Forgot to commit these fixes. Summary: Small git error. These changes should have gone in my last commit. Reviewed By: mcslee Test Plan: Same as the last one. Revert Plan: ok