Merge "Split tagSocket into tagSocket and privilegedTagSocket"