Merge "Merge "Catch runtime exceptions when parsing DHCP packets" into nyc-mr1-dev am: 69544fd74d am: 4b0e3098f2" into nyc-mr1-dev-plus-aosp