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