Merge "Avoid bad method call to patchPatch() in DbTestRecorder"