fix serialization bug
revert serialization fix, add ID to device to prevent android long ID bug