am 7b0bdec4: Merge "Add a tag for tracing system server."

* commit '7b0bdec4b294dff29af1cf75118be5f3d2b346b9':
  Add a tag for tracing system server.