v5: return ApfV6Generator instead of ApfV4Generator in v6 method Test: TH Change-Id: Ia69e51a9c4c00f843f2f531e4710d5413bdcad46