am 8583efe7: Merge "Fix audio structure tags"

* commit '8583efe7880e6db61610c3d51cf573040840d121':
  Fix audio structure tags