Merge "Move the trace file out of the profiles folder." am: 3610abea2f
am: 2dcf91c2b9

* commit '2dcf91c2b9b43bd435bb2806bb8c324a1040c447':
  Move the trace file out of the profiles folder.