Merge "Fix JDK8 compatibility"