Merge "Remove set_nic_state from old remote_client"