Merge "Fix the bug in gps time stamp conversion"