Merge "Give a clear error message if we can't start the server." am: 1046bc5b64
am: 35c1191c65

Change-Id: Ib069ba411e74e6d8c22799a37dc16642b728fb06