Merge "TetheringTest: replace upstream change check by event callback"