Merge "Fix 1.5::WifiBand inheritance"