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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 342ff0d1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0780abd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6056289c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f58d372f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5742ea20 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27bfcaba -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: fba01639 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b95e6578 -s ours