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

Change-Id: Ib70a471603d850069aae029dea7fc09a9b28f4bc
tree: 26813e4744dc715f3f3d32b10a8f081232ca0346
  1. Tethering/