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

Change-Id: Icdfd0ce7357c36ebeb0a6a552be6944c42ad61a9