Merge "Revert "AAI schema update""