Fix issue with previous change which broke some tests.
Fix issue with previous change which broke some tests.

PiperOrigin-RevId: 303432871
Change-Id: I81c6ac3102b8c0fe7f77aff498080fbf445293e7

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