Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev