[automerger skipped] Fix parsing a NduseroptMessage inside a NetlinkMessage....
[automerger skipped] Fix parsing a NduseroptMessage inside a NetlinkMessage. am: 17fd4b42 -s ours am: d8228ba0 -s ours
am skip reason: Change-Id Id0b4dc18dd219b4d35846e161022a37c8de3e3bb with SHA-1 17fd4b42 is in history
Change-Id: Id0def7a6f6a75d1a4b379a9dcf7156c423879c02