am b170b3e8: Merge "Fix stub_test to pass with SS collector."

* commit 'b170b3e89e717c2d84a3ee7987f7460520fb9e17':
  Fix stub_test to pass with SS collector.