Merge "Remove unnecessary usage of deprecated Time class"