Merge "Fix stride/addressing issues for RS tests."