Blindly replacing the timezone information from a timestamp does not
make it correctly UTC. It just strips information away, and therefore
does not make any valid comparison.
This fixes the comparison function by normalizing the timestamps to UTC
before doing any comparison.
Change-Id: I3a1b1eae497200ca951ccb003dbcc75fb75380fa