[fixed] default droid names (again)

Change-Id: I861f4d8a762f954100f8d50c6f3bf3f095571ae2
Merge "[fixed] default droid names (again)" into unstable