Merge "Fix GpsTimeStamp format string"