[automerger skipped] Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 81673c7f5a am: 2461d89f10 -s ours
am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 6656c50d92 is in history
Change-Id: I728a40b68c6b16736d7b537883a0ea9206af585d
This commit is contained in: