Merge "RemovalClient sendRemoved should check remaining instead of fingerId" into oc-dev