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: d9189707 -s ours am: e11b1aef -s ours am: 559268dc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 303cdc5b -s ours am: 692e4894 -s ours am: 8474ccb4 -s ours