Merge "aconfig: add assign_flag_ids function" into main