handle timeout errors

Merged Luciano Ortiz requested to merge 15.0-stage-multipleapis into 15.0-stage

Merge request reports