Merge "Make test_volume_pools A/A compatible"