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

Change-Id: I7d8eff7f53080943c2811837b7ad5d6aca951e0e