Merge "Fix RS test STLs."