[automerger skipped] Refactor DHCP server with StateMachine. am: 1f20cb66...
[automerger skipped] Refactor DHCP server with StateMachine. am: 1f20cb66 am: db59c2f0 am: b963096d -s ours
am skip reason: Change-Id I6c09d9c371e9c4e71d8ba26adaed640e3b97437b with SHA-1 0b20cfee is in history
Change-Id: I59cd08358a221486a0f2f8612d67af9d05a4e776