Merge "Correct the aconfig_flags entries" into main