35dcaece11
Merge commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105' * commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105': Cleanup Netd to prevent getting hung.