Merge "Update AAI release versions"