Merge "Remove assign_static_ip from old remote_client"