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