Merge "Split .oat_patches to multiple sections."