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