Merge "Report other servers' deaths in OnErrorListener too" into nyc-dev