Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048 am: 0e1a1f4c68 am: df94b648c8 am: a37347cae9

Change-Id: Ie4a4e389c3f0bc5754eec0ae489833b8cd2fdb83
tree: 490c4100059f07595d69996a34899b5b33986627
  1. Tethering/