Merge "[OOF] Fix AAI schema version from v19 to v21"