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

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

Change-Id: I6cc14431c73e1b76a4e359e098d96eab6aadbea7