Merge "change string for wifi not connected state." into jb-mr1-dev