Fixed merge conflict from previous change.
Fixed merge conflict from previous change.

hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm,hfp/tensorflow-xsmm