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

* commit '2c4b676d7a4b40879dda9dbf76f66ac1e01c42bd':
  Fixing api versions on rs tests