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