Merge changes from topic "am-2773388a4ed744708388f33c9ccf2a05"

* changes:
  [automerger skipped] Merge "Added string token to CARD support multiple languages" into stage-aosp-master am: a92c7529 -s ours am: 6739b5a5 -s ours am: c36b24ba -s ours am: 7c764927 -s ours
  [automerger skipped] Added string token to CARD support multiple languages am: 8269f703 -s ours am: e88069a6 -s ours am: 0096855c -s ours am: 9291874a -s ours