Merge "Modifies String for better translation" am: 19a80c227f am: bf6175561b
am: 27b01c6088

Change-Id: I5cf3c30e270adeb38cabc2b1a7b581021b938394