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

Change-Id: Ibcbcaac11a0cc90d2f68183673eb4d79603f552f