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

Change-Id: I6e976398877585fb5a9fef26103754b13c17b7fc