Added DeviceId, template androidmanifest