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