Merge "Update AAF versions"