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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: ee6e726d -s ours am: f06c0a63 -s ours am: 16da3075 -s ours am: 7a95b656 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 18fed339 -s ours am: b8c303d8 -s ours am: 4f1f59e3 -s ours am: bf59a526 -s ours