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

Change-Id: Ib42dd37d86b09bc7bd6ceb6d092238ad962ef1eb