Merge "Remove use of deprecated Time class" am: b3f8696c4d am: b83ddefb5c
am: 42b55bc6f6

Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603