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

Change-Id: I47ffda6e9ee89aad714c53fb8647c3d8bf0eab20