Merge "Update for Allocation API changes."