Merge "Refactor DhcpErrorEvent error codes" am: ed2e54a521
am: 150a395303

Change-Id: I6f18975173a21526b3fe8a9c174b16625e1fab0e