Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev