Merge "Revert "Update profiling info allocation logic.""
am: f471155617

Change-Id: I721e31264301f7f2b5c9c4cbebe8f0212e19987d