Merge "Fixing api versions on rs tests"