fix tests failures caused by schema changes
Merge branch 'auto_scale_fix' into cloud_lb_fix
remove unused import