Merge "Update profiling info allocation logic."