Merge "Adding retries for raw_session adapter"