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

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