Merge "Revert "Revert "Add support for relative patching to quick offsets."""