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

* commit '3c611620b382c4129831fa5d7c686d2347118457':
  Move the trace file out of the profiles folder.