[automerger skipped] Merge "Make all DHCP option numbers public." into rvc-dev...
[automerger skipped] Merge "Make all DHCP option numbers public." into rvc-dev am: 01673425 am: 9a8cf456 -s ours
am skip reason: Change-Id I939bfac5ec14175b74ce3713f5af1362de577839 with SHA-1 0fbc1600 is in history
Change-Id: I0bbd48150d9ddc3a93f5f70a260f634b202034fd