Merge "Modify connectivty related strings" into pi-dev