[automerger skipped] Refactor DHCP server with StateMachine. am: 1f20cb66...
[automerger skipped] Refactor DHCP server with StateMachine. am: 1f20cb66 am: db59c2f0 -s ours am: fd0dad01 -s ours am: 2f5ad09d -s ours
am skip reason: Change-Id I6c09d9c371e9c4e71d8ba26adaed640e3b97437b with SHA-1 1f20cb66 is in history
Change-Id: Iec12ee8439b8f27666102f1f8adb0a980aa4fdfe