[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 skip reason: Change-Id I939bfac5ec14175b74ce3713f5af1362de577839 with SHA-1 0fbc1600 is in history
Change-Id: If0f556b8a9699f5da957ae7a41c334034f70052e