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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 37a1d30a -s ours am: e31d123e -s ours am: feb29574 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c05bba57 -s ours am: 7ae59a0e -s ours am: 5009771d -s ours