Merge "Fix leak of DhcpServer on tethering stop error"