Merging r1.8 into master

diff --cc tensorflow/c/c_api_experimental.cc
index 9678ee9,581f574..d3916bc
--- 1/tensorflow/c/c_api_experimental.cc
--- 2/tensorflow/c/c_api_experimental.cc
+++ b/tensorflow/c/c_api_experimental.cc
@@@ -7074,9 -7069,10 +7075,11 @@@ library 
          DCHECK(found);
        };
    return CreateFunctionsFromTextProto(func_def, &mutate_proto_func, status);
 +#endif
  }
+ #endif
  
+ #if not defined(PLATFORM_WINDOWS)
  //  On success, returns a set of TF_Function instances encoding a dataset
  //  node stack that reads an MNIST file dataset from `file_path`, and
  //  sets `dataset_name` to the created dataset name. The returned functions must
@@@ -8219,8 -8209,8 +8222,9 @@@ library 
          DCHECK(found_batch_size);
        };
    return CreateFunctionsFromTextProto(func_def, &mutate_proto_func, status);
 +#endif
  }
+ #endif
  
  // Adds the input functions to `graph`.  On success, returns the created
  // IteratorGetNext node.

diff --cc tensorflow/contrib/eager/python/checkpointable_utils_test.py
Simple merge

diff --cc tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py
Simple merge

diff --cc tensorflow/docs_src/install/install_java.md
Simple merge

diff --cc tensorflow/docs_src/install/install_linux.md
Simple merge

diff --cc tensorflow/python/framework/test_util.py
Simple merge