[automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f5715044 am: 5f6cb314 -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 114dab36 is in history
Change-Id: Ia7c07bfcedff2767e63a0bc15faaa3e8d237a9af