Merge "[String changes] Updating strings as per the suggestion in b/318837875." into main