It looks like the same call, or something similar, is needed in both the 1.0.2 and top of tree versions of the conformance suite. Could you please check them all and, if the fix is actually needed, fix them all at once?