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

Change-Id: I4efba1a195ba7430e729b3cd030a209ab03b7cec