Merge "Create all variants of stubs for tethering" am: 9814b482cb

Change-Id: Ib819726e0409806ea38d2d5e2ef22f9affb96c93