LPS-39780 Remove self reference
LPS-39780 Avoid unnecessary temp String creation