NXP-10130: cosmit in _update_remote_states