Merge "Cherry-pick 'Update the string values for the error message while network scan'"