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

Change-Id: I5a5940bb2737607166cdfccbce521a67e8afcaa8