[automerger skipped] Merge "Create all variants of stubs for tethering" am:...
[automerger skipped] Merge "Create all variants of stubs for tethering" am: 9814b482 am: 293a85c6 -s ours
am skip reason: Change-Id I0ed44691b4e7080818442a9d0eb37d874f707195 with SHA-1 fe8b0458 is in history
Change-Id: I857b4d6c0e7bbfc894219b4d0f9dc6997202ab58