Merge "Fix the overflow when converting current time to milliseconds on 32bit system"