Merge "Create all variants of stubs for tethering" into rvc-dev am: b01a5d5e22

Change-Id: Icee89a66c3b350a1292f878b6d351d205da4a92b