Merge "Update AAI endpoints to /aai/v21"