Merge "Define DhcpErrorEvent constants at compile time"