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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 031c23e0a9 -s ours am: 5c9c24a42a -s ours am: f1cdc9e5df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc09ac7f43 -s ours am: 1c341f0557 -s ours am: 56912c9dfa -s ours