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

Change-Id: Icfc48ac2ac899a25836e142b5c22dae51fd1752f