Merge "Revert "Use aconfig flag for NAH refactoring"" into main