Merge "Update data type and comments on tagSocket/untagSocket APIs"