Merge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
am: ea2f7a4f05

Change-Id: I754c82f77800f09bbe700a3478cd1cac0e090a3d