Merge "Add trace code to system server."