Merge "Update IP2 to use bitmap-backed allocations."