Merge "core/java NetworkManagement: Don't untag sockets willy-nilly"