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

* commit '6ccb30917e16d709c269e75c5d1ab85e34eb52e1':
  Minor changes to netlink code.