[automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours am: f0c477b54a -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history
Change-Id: Ida906ffb11a704782a96dad6bd7f886a8b0c6571
This commit is contained in: