[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 -s ours am: a1d3c6c8 -s ours
am skip reason: Change-Id I939bfac5ec14175b74ce3713f5af1362de577839 with SHA-1 e8198fc2 is in history
Change-Id: I69e1eb7253d874ab50ef73d997413c95421fdf69