[fixed] Set use count properly, droid components and survey droid now behavies correctly

Change-Id: I306b012eb141af477e8f577882b82c6ef2a6e7cb