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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c8ece244 -s ours am: 993276f6 -s ours am: ee23d697 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79f3eabf -s ours am: 975b4a89 -s ours am: fd7b7ac9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f76ef6e5 -s ours am: ff25a68c -s ours am: 22baa05c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e3f1d2a -s ours am: 017a6904 -s ours am: f0bb3eb2 -s ours