Merge "Fix method_verifier_test with the SS collector."