Merge "Fix integer overflow in make_timestamp_ns_locked"