Merge changes from topic "am-87cef09e015842d9b1513c4df9d0d140"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 44d634c681 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be8f1ecc3b -s ours