Merge "add back in aai submodule"