Merge "Update the string values for the error message while network scan." into pi-dev