Merge "Remove use of deprecated Time class"