Merge "Update tethering notification strings"