Merge "Changed Character Limit at request of translation team"
am: 410e38469b

Change-Id: I6564f6b3dacb79c349c048c8e11d353aa13aa714