Merge "Add SafetyNet logging to DHCP packet parsing"