Merge "Revert "Create all variants of stubs for wifi""