am f3078640: am 2c4b676d: Merge "Fixing api versions on rs tests"

* commit 'f30786404c9e22927b465a2f8320d56306014bfd':
  Fixing api versions on rs tests