am 240d8a84: Merge "Use audio tag for system tracing" into jb-dev

* commit '240d8a84dec9f9482257a8037457a1d63193b7ff':
  Use audio tag for system tracing