Merge "Skip autoscaling test until more reliable"