Merge "Merge the following changes to tethering:" into rvc-dev am: 888d833d am: d52845a1 am: 23a6a80c am: 6698af05 Change-Id: I5065ff29590e78add08d3f57adbaeb1b6a90777d