Merge "identity: Fix "possible" overflow when converting current time to milliseconds."