Merge change 26942 into eclair

* changes:
  Minor cleanup of profile and compile logging.