Merge changes from topic "am-ac5f2ebe54394e60b9680b66c40330da"

* changes:
  [automerger skipped] Merge "Added string token to CARD support multiple languages" am: 1c46ad7d -s ours am: 9392e582 -s ours am: b4fe928b -s ours am: ec71863d -s ours am: 34d5deb1 -s ours
  [automerger skipped] Added string token to CARD support multiple languages am: 87c10e7b -s ours am: dbf42d15 -s ours am: 7dbaaf4a -s ours am: 50ccc9cc -s ours am: c7f6da7c -s ours