am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev

* commit 'd401a53c6472921ce7785059195a4f031feea7cc':
  Improve systrace tag propagation