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

Change-Id: I73efd6bfe5cd362fa9988cb17b9152441721518d