Merge "Fix stub_test to pass with SS collector."