Merge "NetlinkListener: eliminate duplicate code"