Merge "Refactor DhcpErrorEvent error codes"