Merge "Remove unused DHCP timeout event tag." into nyc-dev