Merge "Revert "Update profiling info allocation logic.""