Merge "Minor changes to netlink code." am: 6ccb30917e
am: 771f46f216

* commit '771f46f21687031ea436a52cc4311cd90b0631c7':
  Minor changes to netlink code.