Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
am: 6575d483cc  -s ours

Change-Id: I4988ab09ac45812352e8a9ef1738f1986427dc91