Merge "Use aconfig flag for NAH refactoring" into main