Fixed merge conflict.
Fixed merge conflict.

freedomtan/tensorflow,tensorflow/tensorflow,gautam1858/tensorflow,sarvex/tensorflow,paolodedios/tensorflow,davidzchen/tensorflow,frreiss/tensorflow-fred,freedomtan/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,davidzchen/tensorflow,aldian/tensorflow,petewarden/tensorflow,Intel-Corporation/tensorflow,petewarden/tensorflow,petewarden/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,renyi533/tensorflow,karllessard/tensorflow,aam-at/tensorflow,freedomtan/tensorflow,gautam1858/tensorflow,aam-at/tensorflow,freedomtan/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,gunan/tensorflow,gunan/tensorflow,tensorflow/tensorflow-pywrap_saved_model,sarvex/tensorflow,petewarden/tensorflow,aldian/tensorflow,petewarden/tensorflow,karllessard/tensorflow,gautam1858/tensorflow,davidzchen/tensorflow,paolodedios/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,gautam1858/tensorflow,renyi533/tensorflow,tensorflow/tensorflow,annarev/tensorflow,freedomtan/tensorflow,yongtang/tensorflow,tensorflow/tensorflow,paolodedios/tensorflow,tensorflow/tensorflow-pywrap_saved_model,sarvex/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,xzturn/tensorflow,renyi533/tensorflow,frreiss/tensorflow-fred,xzturn/tensorflow,davidzchen/tensorflow,freedomtan/tensorflow,annarev/tensorflow,tensorflow/tensorflow-pywrap_saved_model,renyi533/tensorflow,gautam1858/tensorflow,paolodedios/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,tensorflow/tensorflow-pywrap_tf_optimizer,Intel-Corporation/tensorflow,petewarden/tensorflow,xzturn/tensorflow,tensorflow/tensorflow-pywrap_saved_model,gautam1858/tensorflow,Intel-tensorflow/tensorflow,gautam1858/tensorflow,xzturn/tensorflow,frreiss/tensorflow-fred,tensorflow/tensorflow-pywrap_tf_optimizer,Intel-Corporation/tensorflow,paolodedios/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,paolodedios/tensorflow,freedomtan/tensorflow,Intel-Corporation/tensorflow,aam-at/tensorflow,sarvex/tensorflow,xzturn/tensorflow,cxxgtxy/tensorflow,annarev/tensorflow,aldian/tensorflow,gunan/tensorflow,yongtang/tensorflow,davidzchen/tensorflow,frreiss/tensorflow-fred,davidzchen/tensorflow,gautam1858/tensorflow,frreiss/tensorflow-fred,cxxgtxy/tensorflow,frreiss/tensorflow-fred,gunan/tensorflow,cxxgtxy/tensorflow,sarvex/tensorflow,petewarden/tensorflow,xzturn/tensorflow,petewarden/tensorflow,tensorflow/tensorflow,freedomtan/tensorflow,aam-at/tensorflow,tensorflow/tensorflow,aam-at/tensorflow,frreiss/tensorflow-fred,petewarden/tensorflow,karllessard/tensorflow,tensorflow/tensorflow,cxxgtxy/tensorflow,davidzchen/tensorflow,Intel-tensorflow/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,annarev/tensorflow,freedomtan/tensorflow,cxxgtxy/tensorflow,gunan/tensorflow,paolodedios/tensorflow,karllessard/tensorflow,frreiss/tensorflow-fred,cxxgtxy/tensorflow,xzturn/tensorflow,yongtang/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,aldian/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,karllessard/tensorflow,aam-at/tensorflow,paolodedios/tensorflow,frreiss/tensorflow-fred,yongtang/tensorflow,cxxgtxy/tensorflow,Intel-tensorflow/tensorflow,renyi533/tensorflow,annarev/tensorflow,Intel-tensorflow/tensorflow,paolodedios/tensorflow,gunan/tensorflow,renyi533/tensorflow,tensorflow/tensorflow,davidzchen/tensorflow,tensorflow/tensorflow,aldian/tensorflow,Intel-Corporation/tensorflow,davidzchen/tensorflow,gautam1858/tensorflow,petewarden/tensorflow,sarvex/tensorflow,annarev/tensorflow,Intel-Corporation/tensorflow,renyi533/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,karllessard/tensorflow,xzturn/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,karllessard/tensorflow,aldian/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,yongtang/tensorflow,aam-at/tensorflow,yongtang/tensorflow,xzturn/tensorflow,gunan/tensorflow,petewarden/tensorflow,karllessard/tensorflow,Intel-tensorflow/tensorflow,aldian/tensorflow,annarev/tensorflow,Intel-tensorflow/tensorflow,gautam1858/tensorflow,gunan/tensorflow,xzturn/tensorflow,gunan/tensorflow,xzturn/tensorflow,renyi533/tensorflow,tensorflow/tensorflow-pywrap_saved_model,yongtang/tensorflow,karllessard/tensorflow,tensorflow/tensorflow-pywrap_saved_model,tensorflow/tensorflow-experimental_link_static_libraries_once,Intel-Corporation/tensorflow,freedomtan/tensorflow,davidzchen/tensorflow,yongtang/tensorflow,renyi533/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,Intel-Corporation/tensorflow,gunan/tensorflow,gunan/tensorflow,Intel-tensorflow/tensorflow,tensorflow/tensorflow-pywrap_saved_model,karllessard/tensorflow,gautam1858/tensorflow,gautam1858/tensorflow,annarev/tensorflow,paolodedios/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,Intel-tensorflow/tensorflow,tensorflow/tensorflow-pywrap_tf_optimizer,tensorflow/tensorflow-experimental_link_static_libraries_once,annarev/tensorflow,frreiss/tensorflow-fred,tensorflow/tensorflow-pywrap_saved_model,tensorflow/tensorflow,aam-at/tensorflow,tensorflow/tensorflow,aam-at/tensorflow,davidzchen/tensorflow,petewarden/tensorflow,Intel-tensorflow/tensorflow,aldian/tensorflow,tensorflow/tensorflow,sarvex/tensorflow,frreiss/tensorflow-fred,yongtang/tensorflow,gunan/tensorflow,renyi533/tensorflow,freedomtan/tensorflow,aam-at/tensorflow,aam-at/tensorflow,paolodedios/tensorflow,annarev/tensorflow,tensorflow/tensorflow-experimental_link_static_libraries_once,renyi533/tensorflow,aam-at/tensorflow,cxxgtxy/tensorflow,renyi533/tensorflow,Intel-tensorflow/tensorflow,annarev/tensorflow,karllessard/tensorflow,xzturn/tensorflow,frreiss/tensorflow-fred,yongtang/tensorflow,tensorflow/tensorflow-pywrap_saved_model,sarvex/tensorflow,yongtang/tensorflow,tensorflow/tensorflow-pywrap_saved_model,tensorflow/tensorflow-pywrap_tf_optimizer,davidzchen/tensorflow,Intel-tensorflow/tensorflow,freedomtan/tensorflow,tensorflow/tensorflow-pywrap_saved_model