Merge "Add request id to logs if we get a timeout."