Merge "Use arena allocation for profiles" am: 81cbb240f8
am: 6944811bb0

Change-Id: Id807f88195736e0c6dd564ee2783547af6eb2eed