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

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

Change-Id: I5addd9b87c64877928510b2f58ea06a78625cc62