Merge "Give a clear error message if we can't start the server." am: b6d3f28287
am: 1496863091

Change-Id: Ib069ba411e74e6d8c22799a37dc16642b728fb06