added cherrypick 74856

Fixes occasional tethering settings fc