1f8cf09c53
* commit '2815bb05a042975b282f7131514368aa89cf0dd4': more string changes for wi-fi trademark compliance
* commit '2815bb05a042975b282f7131514368aa89cf0dd4': more string changes for wi-fi trademark compliance