Merge "Report errors from CtsTestServer for improved debugging"