Merge "Add custom allocator support for Allocation objects." into jb-mr2-dev