Merge "Ensure compute features enabled in test_images"