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

Change-Id: I320506bdd1425dc14b770cb8f29dd9a36a895299