Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69d am: 87364693 Change-Id: I9ed8840ffeeedf61610a4e61ab63542781f21f1b