Merge "Comment Android specific change to Socket proxy"