[automerger skipped] Fix parsing a NduseroptMessage inside a NetlinkMessage....
[automerger skipped] Fix parsing a NduseroptMessage inside a NetlinkMessage. am: 17fd4b42 am: b4955081 am: 531257ad am: 68a0b8d8 -s ours
am skip reason: Change-Id Id0b4dc18dd219b4d35846e161022a37c8de3e3bb with SHA-1 17fd4b42 is in history
Change-Id: I51090e3dd78d289d2a966fd8655cd7f4ad680e85