* Fixed freezing tf1 pre-trained model issue due to mix use of tf1 and tf2 API * Fix review comments * Apply suggestions from code review
* Fixed freezing tf1 pre-trained model issue due to mix use of tf1 and tf2 API * Fix review comments * Apply suggestions from code review