Merge "Update RSTest_Compat for stride changes."