Merge "Add AAI updates"