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

Change-Id: I4e942b1c3f00b2c9f2ee58c681b6b5b21c3ce1a8