am dc80e8e2: am d0056cea: Merge "Include pid in trace metadata"

* commit 'dc80e8e2ccea501a2f8f3ec15471379160a39a0d':
  Include pid in trace metadata