Merge "Remove unused aconfig" into main