Merge "Fix AutoScalingTest test suite error"