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

Change-Id: I510e3d283301a411b9a0cda5a1a715e033127f23