DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine" This reverts commit 9cfe6197fb8ccc27a2d9e385ca400c6976ba2748. Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64