Merge \\"Ensure we have a profiling info object before trying to compile.\\" am: 08f746d4a5
am: 1a7ce5311c

Change-Id: I08cfe497a08568f660ba6f963bd2401009adeae1