Merge "Update AAI version to v23."