Make time formatting better

Change-Id: I9d40dc05211b71a52c58d0e296a4c496d3edfcb2