Merge "Merge the following changes to tethering:" into rvc-dev am: 888d833d11 am: d52845a1db am: 091e689c8a

Change-Id: I3fd66eb4e51524d175631385e7d52b36ac84b919