am d0056cea: Merge "Include pid in trace metadata"

* commit 'd0056ceab8a78d5cfc0b4e06bce548b2d1cf1fef':
  Include pid in trace metadata