Merge "Fix the unit of timer from sec to millisec"