Replace deprecated String.prototype.substr()

Replace deprecated String.prototype.substr() #33784