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