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

* changes:
  Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b9d0cc90 -s ours" into udc-dev am: 55b94e51 -s ours am: 7284c8ac -s ours am: 64469056 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b9d0cc90 -s ours am: 751b7338 -s ours am: 1b33253c -s ours am: 395d8b0d -s ours