Merge "Define DhcpErrorEvent constants at compile time" am: 5803191975 am: a0b2076f75
am: e229cc2c95

Change-Id: I47dac7870289bce6763c1d778c2e8aeb77741666