Merge "Fix broken time comparison."
am: e9f6953dea

Change-Id: I42a9cadc6a1460340487be4bbcbe8f4d8bb0aae5