Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e am: 6c156c85cf

Change-Id: I3320229b0db242499041df6dc1e176f2efb8929a
tree: 70f97049fbc31aa2d1abdf8b3124ebfa7d9ced61
  1. Tethering/