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

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

Change-Id: Id9eb13bcd83b62d1cc4ed6bac0b5ba7d189c900f