Merge "Move adapter conversion flag to aconfig" into main