Merge "Fix TetheringTest crash on eng build" into sc-dev