Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f5715044 am: 5f6cb314 am: 6c156c85 Change-Id: I3320229b0db242499041df6dc1e176f2efb8929a