CB-2200: Remove deprecated Android device.name