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

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