Merge changes from topic "am-e6d1a8951af245e0ae1d59c4509ad225"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: cfd28712 -s ours am: 140509db -s ours am: 65797fbf -s ours am: e652c51d -s ours am: dffabbb4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6744aa3 -s ours am: eea9c877 -s ours am: f043a5d0 -s ours am: dcca3bdb -s ours am: d1a4d5b4 -s ours