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

Change-Id: I5ce53e7d0d51fff18ab23030f3a9a556345c095f