Merge "Fix RS tests to prepare for 64-bit compilation."