Merge "Support AFC channel allowance feature flag"