am 30ce0c4e: Merge "Fix CHAR LIMIT of some string resources" into jb-dev

* commit '30ce0c4e64ff4a52dcdefde8b55cfbd12adeb4a7':
  Fix CHAR LIMIT of some string resources