am 40a8bb3b: Merge "Add a tag for tracing system server."

* commit '40a8bb3b2290f77a90735633eab350133f9bb9d2':
  Add a tag for tracing system server.