Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs