Fix changes for Ia1878588 to work with databases that use non-integer timestamps.

Change-Id: Id51ab135baa35440005b38f2f2f466f4378deb31