Merge "Catch runtime exceptions when parsing DHCP packets" into nyc-mr1-dev