Merge "resolve open review comments wrt. libnetd_offloadutils"