[automerger skipped] Refactor DHCP server with StateMachine. am: 1f20cb66 -s...
[automerger skipped] Refactor DHCP server with StateMachine. am: 1f20cb66 -s ours am: 1d717d8a -s ours
am skip reason: Change-Id I6c09d9c371e9c4e71d8ba26adaed640e3b97437b with SHA-1 1f20cb66 is in history
Change-Id: Ic2f2db47cca651d1db546046c7ea20b52677031f