Merge "Report other servers\' deaths in OnErrorListener too" into nyc-dev am:...
Merge "Report other servers\' deaths in OnErrorListener too" into nyc-dev am: 375a9c03 am: 63c857c7
am: 59cce0ae
* commit '59cce0ae':
Report other servers' deaths in OnErrorListener too
Change-Id: Ib92b8d96e53cb08700fdcab62c5f19e2b4ac2f54