Merge "Fix broken time comparison." am: e9f6953dea am: 658c49b55f
am: f4392dbd37

Change-Id: I5635ee7dd701286027bd103b87accec40cf3d0ff