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

Change-Id: I4b16e09153aa6991fcb933b097270826b5920a82