Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6

Change-Id: If79d8724b82021a7840a73b642d9f5fdb07943e2
tree: 911c5675220e3588246b524e96c3227ad7b055f0
  1. Tethering/