Merge changes from topic "am-95474b994e6649ac909d7c53d21d493c"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1f23d6ff -s ours am: e69b5685 -s ours am: 1cedb195 -s ours am: 6407d1a9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fea01518 -s ours am: 7fc7e011 -s ours am: 093bf0af -s ours am: 0cac4bea -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e240b41 -s ours am: 5e15cffd -s ours am: 58c4457f -s ours am: 8ca262ce -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000e64a4 -s ours am: 15b68e14 -s ours am: 3204ced5 -s ours am: 2a18e173 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1ae883aa -s ours am: c169b084 -s ours am: 8219d833 -s ours am: 63b8e606 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6133d728 -s ours am: 43aa84f5 -s ours am: f4a79552 -s ours am: 4118bc10 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bf1a655e -s ours am: 15c9ec79 -s ours am: 2880d699 -s ours am: 49e8eb5d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e1ac18b -s ours am: 3ec58776 -s ours am: 8c7958a1 -s ours am: 3426e1bc -s ours