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

Change-Id: I55ff57be344e17d3ce16cda7291f7f29f26191b1
tree: 8680f83faf7393d2faf68d180da31e155300a504
  1. Tethering/