Merge "Revert "Support multiple params in DeviceEvent""