Merge "java.time.Instant.toEpochMilli() fixes"