am 8a4222a6: Merge "Add tracing header" into mnc-dev

* commit '8a4222a647bd17c991959eca17a50ba911c3ab6b':
  Add tracing header