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

Change-Id: Ib37e75e06b9a6bc6690e701652c659d8ed0fc580