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

* commit '0425327d16974e73ada8674ac3b1268485508adb':
  Fix integer overflow in time conversion