Merge "Extend netlink class to fit the data structure" am: 0825500b27
am: b862f54f41

Change-Id: I9627f5dd2f8fec93fe4381b2ff38b5c9399be9b6