Merge \"Ensure we get a ProfilingInfo object before compiling.\"
am: 48f9f28c9b

Change-Id: I4886b150e1b83a5319996fc2d9c96745db9502fb