Previous fix was incorrect.

Timestamp doesn't contain date info, therefore we need to construct it
and adjust it if daylight savings applies.

Change-Id: Ic6b5b3e2d773f637a99a80ef0998ee4f9989a8eb