Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f79616b427  -s ours

* commit 'f79616b4277f477985f96f8a486126a389905c7d':
  Import translations. DO NOT MERGE

Change-Id: I35c307deac6f9b0fc01102841cd567a0ec2e4b6f