Merge "Store trace files in app-specific dirs." into nyc-dev am: a17b7d0
am: 95e0922

* commit '95e092228e1a8d306b369f3d402c8def3243b4a9':
  Store trace files in app-specific dirs.