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

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