--- a/jdk/src/java.base/share/classes/java/time/Instant.java	Tue Oct 20 19:34:04 2015 +0900
+++ b/jdk/src/java.base/share/classes/java/time/Instant.java	Tue Oct 20 13:10:28 2015 -0400
@@ -758,7 +758,7 @@
             throw new UnsupportedTemporalTypeException("Unit must divide into a standard day without remainder");
         }
         long nod = (seconds % LocalTime.SECONDS_PER_DAY) * LocalTime.NANOS_PER_SECOND + nanos;
-        long result = (nod / dur) * dur;
+        long result = Math.floorDiv(nod, dur) * dur ;
         return plusNanos(result - nod);
     }