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

Change-Id: I80bdacc84f126fc45288d6f42d89bcd37e4d9034