Merge changes from topic "am-dbd748777ce1427b9574bc82b9b5d98f" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9deb6ce1 -s ours am: 46269a1a -s ours am: d331116f -s ours am: e8ee8e55 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4a097cd -s ours am: 4a78b1f0 -s ours am: d62f8384 -s ours am: cc3bb6bc -s ours