Merge "Sync guest SubAllocator with host version"