am 4fd5d37c: Merge "Fix RS tests to prepare for 64-bit compilation."

* commit '4fd5d37ce45a4ad0708ad5ffbd68e73696838d05':
  Fix RS tests to prepare for 64-bit compilation.