Merge commit for internal changes

diff --cc tensorflow/contrib/py2tf/utils/BUILD
Simple merge

diff --cc tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
Simple merge

diff --cc tensorflow/contrib/timeseries/python/timeseries/BUILD
index 637e1fd,fff972c..64f5cd8
--- 1/tensorflow/contrib/timeseries/python/timeseries/BUILD
--- 2/tensorflow/contrib/timeseries/python/timeseries/BUILD
+++ b/tensorflow/contrib/timeseries/python/timeseries/BUILD
@@@ -425,8 -425,6 +425,7 @@@ py_test
      srcs_version = "PY2AND3",
      tags = [
          "no_pip_gpu",  # b/63391119
-         "nomsan",
 +        "no_windows",  # TODO: needs investigation on Windows
      ],
      deps = [
          ":feature_keys",

diff --cc tensorflow/core/ops/array_ops.cc
Simple merge

diff --cc tensorflow/workspace.bzl
Simple merge