am 5921f490: Merge "Use milliseconds to avoid timezones" into lmp-dev

* commit '5921f4908c4d068961789eb02bc292826a65064c':
  Use milliseconds to avoid timezones