Fix removeTarget to remove by ID instead of index.

Bug 22043875

Change-Id: I47933343381df7c46580279a864ab03d44c992ec
1 file changed