Merge "Create all variants of stubs for tethering" into rvc-dev am: ab74d2b865 am: 6030bad6f0

Change-Id: I3705e03b2f0bf0d1275a8a1bbb771044cda9bb94