Do not use string concatenation for localized strings

Change-Id: I974917c363ba7eb152d2487899b600fa0355e938
Merge "Do not use string concatenation for localized strings"