Revert "Make timestamp in consistent format after loaded from database"

It should handle NULL

This reverts commit 31a986bebdb286a100192a6fa779dc48fae3bab7.

Change-Id: I202a7c6f8deaf0b6bbf3af1981f4f25077e916db
Merge "Revert "Make timestamp in consistent format after loaded from database""