[automerger skipped] Merge "Support parsing ND option messages." into rvc-dev...
[automerger skipped] Merge "Support parsing ND option messages." into rvc-dev am: 77e02602 -s ours
am skip reason: Change-Id I3b71e63ee2cdaa40d095e889188943c5b0cd13af with SHA-1 bb1878a3 is in history
Change-Id: I9246a516e23b2d3ee7e340a0e465eee0b0411c76