am f16fe893: Merge "Fix method_verifier_test with the SS collector."

* commit 'f16fe893139345dad8b05b3db3e717c6f8d079d0':
  Fix method_verifier_test with the SS collector.