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

Change-Id: I94eab009d4f0808e9a301dcd5ec08a4b5ab611be