Merge "Remove leftover todo related to the dhcpcd support"