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

Change-Id: Iab244e7059653faec65bd1d3c9ae44b178f0420b