Merge "diag: Change maximum size of error response"