Merge "Add aconfig flag for NAH refactoring" into main