Merge "Revert "Update profiling info allocation logic."" am: f4711556 am: 9084296a am: fd7433e1 am: b67997f2 Change-Id: Ie7e0a8bfd0f699f4567b551bd2ff9826c66e4ee9