Merge "Refactor isTetheringSupported() calls"