Bug 1027787 - Unique device discovery names for b2g. r=paul