Merge "Remove unnecessary usage of deprecated Time class"
am: 39b253ff6c

Change-Id: Ida6d63d920ac21fb05ba789f45656478dae07c4a