Merge "Update profiling info allocation logic."
am: 33e9483f64

Change-Id: I8ab566492f856283d5e4bb97f96eb8a2f1045dcd