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