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

Change-Id: I8761a413249e5ba95f584e0a89c7acfa388d7f00