[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: d36e32d3 -s ours
am skip reason: Change-Id I0ed44691b4e7080818442a9d0eb37d874f707195 with SHA-1 fe8b0458 is in history
Change-Id: I17500658707b0ffe9e21ee26014407725edfbcd5