Merge "Correctly time out CMD_START_DHCP." into mnc-dev