Merge "Fix TetheringPrivilegedTests crash"