Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev