Merge "Update AAI Schema selection to v13 for multicloud"