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

Change-Id: If5cece76433f7f35896eb73936dc00c9eea292be