Merge "aconfig: turn off the offending test point" into main