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

Change-Id: I2f434b22c33949e2b09b1659e44abdc073e8d104