Merge "Correct namespace for afl_api flag." into main