am 318dd9b8: Merge "Fix integer overflow in time conversion"

* commit '318dd9b80789bdb30a7cf828a7ca18f6422c95c4':
  Fix integer overflow in time conversion