Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa

Change-Id: I2491c2702fd2654de5e97073a77183807f41e492
tree: 9d43dbca1103f702a26e566f019a9495457ef877
  1. Tethering/