Merge "Refactored references to AaiUtils"