fixed timestamps but not UI

Change-Id: I58c8bddb3f7d8d3776545544cd6d43aa6cf26194