Merge "Update baseline for SamShouldBeLast check"